css provider: Make not subclassable

Part of being more explicit about what
we allow to be subclassed and what not.

diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index f3dfa9922b8064b64cd71814d44d806ee39c6814..6d6571b59b1eeccac6286c118457bdfa2f1a2941 100644 (file)
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -73,6 +73,14 @@
  * way back to 4.0.
  */
 
+struct _GtkCssProviderClass
+{
+  GObjectClass parent_class;
+
+  void (* parsing_error)                        (GtkCssProvider  *provider,
+                                                 GtkCssSection   *section,
+                                                 const GError *   error);
+};
 
 typedef struct GtkCssRuleset GtkCssRuleset;
 typedef struct _GtkCssScanner GtkCssScanner;

diff --git a/gtk/gtkcssprovider.h b/gtk/gtkcssprovider.h
index c2fb467b50c5a05ea32e2d8cc57f83cf93f013da..01d26bf326dd2bd8c26028783afb6f6e22550558 100644 (file)
--- a/gtk/gtkcssprovider.h
+++ b/gtk/gtkcssprovider.h
@@ -25,10 +25,7 @@ G_BEGIN_DECLS
 
 #define GTK_TYPE_CSS_PROVIDER         (gtk_css_provider_get_type ())
 #define GTK_CSS_PROVIDER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GTK_TYPE_CSS_PROVIDER, GtkCssProvider))
-#define GTK_CSS_PROVIDER_CLASS(c)     (G_TYPE_CHECK_CLASS_CAST    ((c), GTK_TYPE_CSS_PROVIDER, GtkCssProviderClass))
 #define GTK_IS_CSS_PROVIDER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTK_TYPE_CSS_PROVIDER))
-#define GTK_IS_CSS_PROVIDER_CLASS(c)  (G_TYPE_CHECK_CLASS_TYPE    ((c), GTK_TYPE_CSS_PROVIDER))
-#define GTK_CSS_PROVIDER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS  ((o), GTK_TYPE_CSS_PROVIDER, GtkCssProviderClass))
 
 typedef struct _GtkCssProvider GtkCssProvider;
 typedef struct _GtkCssProviderClass GtkCssProviderClass;
@@ -39,19 +36,6 @@ struct _GtkCssProvider
   GObject parent_instance;
 };
 
-struct _GtkCssProviderClass
-{
-  GObjectClass parent_class;
-
-  void (* parsing_error)                        (GtkCssProvider  *provider,
-                                                 GtkCssSection   *section,
-                                                 const GError *   error);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
 
 GDK_AVAILABLE_IN_ALL
 GType gtk_css_provider_get_type (void) G_GNUC_CONST;